Fix test generating gpx schema violations. (#444)

TODO: Detect bad input coordinates.

diff --git a/reference/route/route1~csv.gpx b/reference/route/route1~csv.gpx
index 23c5f0b65aa189bfa1a5902588b8bc046d6a41ef..ba122780556062435a7fd86f1317af3177a8f06c 100644 (file)
--- a/reference/route/route1~csv.gpx
+++ b/reference/route/route1~csv.gpx
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gpx version="1.0" creator="GPSBabel - http://www.gpsbabel.org" xmlns="http://www.topografix.com/GPX/1/0">
   <time>1970-01-01T00:00:00Z</time>
-  <bounds minlat="-106.000000000" minlon="40.000000000" maxlat="-104.000000000" maxlon="42.000000000"/>
+  <bounds minlat="40.000000000" minlon="-106.000000000" maxlat="42.000000000" maxlon="-104.000000000"/>
   <rte>
     <name>myroute</name>
-    <rtept lat="-104.000000000" lon="40.000000000">
+    <rtept lat="40.000000000" lon="-104.000000000">
       <name>RPT001</name>
     </rtept>
-    <rtept lat="-104.100000000" lon="40.100000000">
+    <rtept lat="40.100000000" lon="-104.100000000">
       <name>RPT002</name>
     </rtept>
-    <rtept lat="-105.000000000" lon="41.000000000">
+    <rtept lat="41.000000000" lon="-105.000000000">
       <name>RPT003</name>
     </rtept>
-    <rtept lat="-105.100000000" lon="41.100000000">
+    <rtept lat="41.100000000" lon="-105.100000000">
       <name>RPT004</name>
     </rtept>
-    <rtept lat="-105.200000000" lon="41.200000000">
+    <rtept lat="41.200000000" lon="-105.200000000">
       <name>RPT005</name>
     </rtept>
-    <rtept lat="-106.000000000" lon="42.000000000">
+    <rtept lat="42.000000000" lon="-106.000000000">
       <name>RPT006</name>
     </rtept>
   </rte>

diff --git a/reference/track/track1-2~csv.gpx b/reference/track/track1-2~csv.gpx
index cacf14d9dcc2bb807003bb32b1e3ae1ee2fffa17..9db15cd18446357ef9e8261e17d3eae682d8b619 100644 (file)
--- a/reference/track/track1-2~csv.gpx
+++ b/reference/track/track1-2~csv.gpx
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gpx version="1.0" creator="GPSBabel - http://www.gpsbabel.org" xmlns="http://www.topografix.com/GPX/1/0">
   <time>1970-01-01T00:00:00Z</time>
-  <bounds minlat="-106.000000000" minlon="40.000000000" maxlat="-104.000000000" maxlon="42.000000000"/>
+  <bounds minlat="40.000000000" minlon="-106.000000000" maxlat="42.000000000" maxlon="-104.000000000"/>
   <trk>
     <name>mytrack-0</name>
     <trkseg>
-      <trkpt lat="-104.000000000" lon="40.000000000"/>
-      <trkpt lat="-104.100000000" lon="40.100000000"/>
+      <trkpt lat="40.000000000" lon="-104.000000000"/>
+      <trkpt lat="40.100000000" lon="-104.100000000"/>
     </trkseg>
   </trk>
   <trk>
     <name>mytrack-1</name>
     <trkseg>
-      <trkpt lat="-105.000000000" lon="41.000000000"/>
-      <trkpt lat="-105.100000000" lon="41.100000000"/>
-      <trkpt lat="-105.200000000" lon="41.200000000"/>
+      <trkpt lat="41.000000000" lon="-105.000000000"/>
+      <trkpt lat="41.100000000" lon="-105.100000000"/>
+      <trkpt lat="41.200000000" lon="-105.200000000"/>
     </trkseg>
   </trk>
   <trk>
     <name>mytrack-2</name>
     <trkseg>
-      <trkpt lat="-106.000000000" lon="42.000000000"/>
+      <trkpt lat="42.000000000" lon="-106.000000000"/>
     </trkseg>
   </trk>
 </gpx>

diff --git a/testo.d/xcsv.test b/testo.d/xcsv.test
index 5cbfa297dff65dac4dbf45ebdb0bd2af412de9b5..6cb0569a67f04eb07afe2ed857f5736c37283e3c 100644 (file)
--- a/testo.d/xcsv.test
+++ b/testo.d/xcsv.test
@@ -39,8 +39,8 @@ echo 'EXTENSION csv' >>${TMPDIR}/track1.style
 echo 'FIELD_DELIMITER COMMA' >>${TMPDIR}/track1.style
 echo 'RECORD_DELIMITER NEWLINE' >>${TMPDIR}/track1.style
 echo 'DATATYPE TRACK' >>${TMPDIR}/track1.style
-echo 'IFIELD LON_DECIMAL,"","%f"' >>${TMPDIR}/track1.style
 echo 'IFIELD LAT_DECIMAL,"","%f"' >>${TMPDIR}/track1.style
+echo 'IFIELD LON_DECIMAL,"","%f"' >>${TMPDIR}/track1.style
 echo 'IFIELD TRACK_NAME,"","%s"' >>${TMPDIR}/track1.style
 echo 'IFIELD TRACK_NEW,"","%d"' >>${TMPDIR}/track1.style
 gpsbabel -i xcsv,style=${TMPDIR}/track1.style -f ${REFERENCE}/track/track1.csv -o gpx -F ${TMPDIR}/track1~csv.gpx
@@ -52,8 +52,8 @@ echo 'EXTENSION csv' >>${TMPDIR}/track2.style
 echo 'FIELD_DELIMITER COMMA' >>${TMPDIR}/track2.style
 echo 'RECORD_DELIMITER NEWLINE' >>${TMPDIR}/track2.style
 echo 'DATATYPE TRACK' >>${TMPDIR}/track2.style
-echo 'IFIELD LON_DECIMAL,"","%f"' >>${TMPDIR}/track2.style
 echo 'IFIELD LAT_DECIMAL,"","%f"' >>${TMPDIR}/track2.style
+echo 'IFIELD LON_DECIMAL,"","%f"' >>${TMPDIR}/track2.style
 echo 'IFIELD TRACK_NEW,"","%d"' >>${TMPDIR}/track2.style
 echo 'IFIELD TRACK_NAME,"","%s"' >>${TMPDIR}/track2.style
 gpsbabel -i xcsv,style=${TMPDIR}/track2.style -f ${REFERENCE}/track/track2.csv -o gpx -F ${TMPDIR}/track2~csv.gpx
@@ -65,8 +65,8 @@ echo 'EXTENSION csv' >>${TMPDIR}/route1.style
 echo 'FIELD_DELIMITER COMMA' >>${TMPDIR}/route1.style
 echo 'RECORD_DELIMITER NEWLINE' >>${TMPDIR}/route1.style
 echo 'DATATYPE ROUTE' >>${TMPDIR}/route1.style
-echo 'IFIELD LON_DECIMAL,"","%f"' >>${TMPDIR}/route1.style
 echo 'IFIELD LAT_DECIMAL,"","%f"' >>${TMPDIR}/route1.style
+echo 'IFIELD LON_DECIMAL,"","%f"' >>${TMPDIR}/route1.style
 echo 'IFIELD ROUTE_NAME,"","%s"' >>${TMPDIR}/route1.style
 gpsbabel -i xcsv,style=${TMPDIR}/route1.style -f ${REFERENCE}/route/route1.csv -o gpx -F ${TMPDIR}/route1~csv.gpx
 compare ${REFERENCE}/route/route1~csv.gpx ${TMPDIR}/route1~csv.gpx